Merge git://git.denx.de/u-boot-net
authorTom Rini <[email protected]>
Wed, 28 Feb 2018 01:10:28 +0000 (20:10 -0500)
committerTom Rini <[email protected]>
Wed, 28 Feb 2018 01:10:28 +0000 (20:10 -0500)

Trivial merge